merge trunk
authorKenichi Handa <handa@etlken>
Mon, 26 Apr 2010 01:22:02 +0000 (10:22 +0900)
committerKenichi Handa <handa@etlken>
Mon, 26 Apr 2010 01:22:02 +0000 (10:22 +0900)
commita0ab8141b7a66c3819a103199296ff21293063f7
treedfb7a6948864a5631839ad1d3eb881f790698b60
parentc09124c77ece9d7222e0ae34027b11bca238fbc6
parentcd44ebad8458350fde36badce522c26d8c9de19b
merge trunk